Don't free info too early. (#154703, Morten Welinder)

2004-10-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (check_is_folder): Don't free
	info too early.  (#154703, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 2f7988e7a51f87c52956d29ce57427f77f725acc..33b0618adcd6b1f93686b891681102911ec228fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 
+       info too early.  (#154703, Morten Welinder)
+
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_compute_position): Reduce rounding 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2f7988e7a51f87c52956d29ce57427f77f725acc..33b0618adcd6b1f93686b891681102911ec228fc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 
+       info too early.  (#154703, Morten Welinder)
+
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_compute_position): Reduce rounding 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2f7988e7a51f87c52956d29ce57427f77f725acc..33b0618adcd6b1f93686b891681102911ec228fc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 
+       info too early.  (#154703, Morten Welinder)
+
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_compute_position): Reduce rounding 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2f7988e7a51f87c52956d29ce57427f77f725acc..33b0618adcd6b1f93686b891681102911ec228fc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free 
+       info too early.  (#154703, Morten Welinder)
+
 2004-10-06  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_compute_position): Reduce rounding 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index fc7446c8f33531604592c5585165834af9fddca0..6a75d43f43b05273ea307815c3ed5a5dbc05e6f3 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1059,21 +1059,18 @@ check_is_folder (GtkFileSystem *file_system, const GtkFilePath *path, GError **e
     return FALSE;
   
   is_folder = gtk_file_info_get_is_folder (info);
-  gtk_file_info_free (info);
 
   if (!is_folder)
-    {
-      g_set_error (error,
-                  GTK_FILE_SYSTEM_ERROR,
-                  GTK_FILE_SYSTEM_ERROR_NOT_FOLDER,
-                  "%s: %s", 
-                  gtk_file_info_get_display_name (info),
-                  g_strerror (ENOTDIR));
+    g_set_error (error,
+                GTK_FILE_SYSTEM_ERROR,
+                GTK_FILE_SYSTEM_ERROR_NOT_FOLDER,
+                "%s: %s", 
+                gtk_file_info_get_display_name (info),
+                g_strerror (ENOTDIR));
 
-      return FALSE;
-    }
+  gtk_file_info_free (info);
 
-  return TRUE;
+  return is_folder;
 }
 
 /* Inserts a path in the shortcuts tree, making a copy of it; alternatively,